finishing off duties and starting to test and fix minor issues