Fixing clean
Typos, mistakes
First draft of catch.