Smalll bugs solved