M kamberger 7 8 bug fixes

I've made some updates that need to be merged in