Fixes

Fixing everything that we've talked over at meeting