Fixes

Fixing random things to get started