minor changes, need to pull
fixed some merging issues