Bugfixes and improvements.
Remove unnecessary class imports..