fixed some stuff
added pieces
Merge pull request #3 from ppicinic/base.cleanup-1

Base.cleanup 1