Long delayed update :+1:

Some important fixes and and other crap..