fixes
thanks to @ethanspitz for all this