Minor changes and some work on #2