Whoops, meant to open a PR for all the commits

Fixing Bugs