Fixed manager
finding bugs
Bug fixes