added some JavaDoc
removed BaseItem which is not used atm