Some bug fixes etc..
Merge branch 'Development'