bug fixes and added annotation driven beans