anotations / clean up / msic changes
tweaks