changed some comments and method names/order