updating
resolved conflicts
cleaned up some features