Starting work again, some small tweaks and improvements