left debug on
small style changes + bug fix