Minor updates to options and project
Tie in more add-in logic and cleanup project