maven dependencies fixed and code review fixes partially done