minor changes
fixed conflicts
refactoring
added forgotten files