Working on a few bugs.