added comments about, fixed bugs