added comments and cleanup; comments in sexps are broken, need to rewrite