Some bug fixes
Finishing doc blocks inserting into base classes