fixed bugs again
Revert "Revert "fixed errors""

This reverts commit a202b038d259d5b77001ce758f3027d37a69ae54.
Revert "fixed errors"

This reverts commit afcb48e6065ae9355ec7b213f583054a245b8be6.
back to where we started

yep