Develop, fixes some of the reported issues

Time to push some code to the stable branch after fixing some of the most annoying issues reported.