Fixed a number of bugs that were found thanks to your feedback, thank you!