Fixed some minor bugs.  Things are all ready for LAHacks.  Fight on