Updates, and new minor feature additions