Squashed some bugs and branches.