A combined set of bug fixing and improvements to be tested on the lab/test server. More to come before going to production.
