made a lot of changes, finishing up