Worked a little on the bugs.