Tidyied up some project issues