Version 1.4.1+

Lots of changes i should have commited earlier