Fixing bugs
Tidying up