Some work on some more stuff, minor additions and tweeks