minor changes
bunch of stuff to be done