Debugged some stuffs