Fixed bugs in API, Persistence and Service, added Presentation