Starting bugfixes!