Some more bug-fixes and unifying things...