changed rest data objects, fixed a lot of bugs