forgot to write class name;

also debugged one error caused by not doing typecasting.
Revert "forgot to write class name;"

This reverts commit 0887f43ddddbcaaa9e8be767d82db7cd41834430.