comments in methods and fixes