resolved #11, cleaned up comments