fixed loads of tihngs , including names