Removed debugging and added small changes all over the place
Merge remote-tracking branch 'origin/master'