style fixes
added time remaining estimate to console output; several small fixes
merge changes