More work

changes should explain themselves