other little bugs fixed :)