fixed various stuff to prepare for deployment