fix installer logic, tidy up some installer word-wrapping