Starting again

Fixing some amateur issues