Getting closer

Cleaning up mistakes