Included corrections and changes from Jannes, thanks too :)