some bugfixes, getting ready to maybe re-deploy