Fixed a couple bugs that user testing revealed