fixed up bunch o bugs