Cleaned up debug code
Installation type default is set more reasonably.