debugged + clean up fellow details