Defendoooooor!!: Bug fixing!!

fixed minor bugs