bugs fixed after unit and integration testing