Fixes, cleanups, shity code etc.