Debugged some minor things