Some more comments and code simplification resulting in less errors.