A number of updates and improvements (spare time)