clean up, add comments and remove fixed issues