Finishing working on #2, other improvements