cleaning of code and some comments
small fixes