Some bugfixes!!!!