Bugs squashed. Tested and everything works as expected