Fixin' minor bugs.
Fixin' bugs