updates

some early tidying up, still not 100% sure on where to go with this