consts + cleaning
review corrections progress