more commits
fixing commit mess and syncing with master