comment and clean
commit small finalish changes