Fix minor bugs

bugs = fixed XD