lots of changes, going in a good direction I think