final updates and ready for appfog