Worked out some bugs.