minor code cleanup
refined text display
code cleanups
started wix/installer project
Merge from master on Github