Small fixes

We need to stop pushing work in progress, either finish the code or dont push the update to master. Make a branch for WIP and can be merged when its finished and agreed on.