minor
lots of changes