added some refs, removed most @ comments