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