added annotations
added annotations
added annotations
Multiple changes based on recent annotations/comments
Minor updates and tweaks based on comments