Kind of a stable state
various fixes after trying to deploy it
todo