HRM Reviews 2 and 3 implemented as suggested and other minor bugs fixed