Fixed some minor bugs - Caspar