- Added spring bean configurations.
- Minor fixes.