Work on bugs

March 8