Squashed most bugs.