Indentation of code and bugfix

Last changes where bug ridden, sorry for anyone encountering these releases.
This corrects the remaining errors after restructuring the code and corrects indentation