Sprint3

hotfixes, tasks and activities