Fixed bugs and made new uml