Debugged some