Fixed .sln to account for repo migration
Multiple small
Cleanup of unneccesary code
Merge branch 'pawel'