A number of small bug fixes and improvements after a testing session.