fixing bug I created migrating new code
finished with updates for now, maybe some more at some point but its a
lot more ready for work