huge rebased commit for github
some fixes and setup to deploy