more cleaning, added debug options
comment cleanups