fixing lots o bugs