hotfix and minor changes getting rid of comments for final release