most bugs sorted now I think