New years bug fix
Small bugfixes!