more changes. still more to do to figure out whats up