Final Comments and Code Cleanup. Fixed windows iterator bug