fixed 2 bugs.  wooooh