v2.1.3

Fixed: Minor bugs and overall improvements.