Continued fix of code

Corrected errors with catcher and raindrop classes