fixes done
Merge branch 'quickfixes'