Fixed some minor bugs.  Works.