fix issues 7 and 8, remove stary files