lots of changes, just trying to get rid of bugs