improved comments, method visiblity and exceptions