Some last minute tweaks and double checking everything works