Begin fixing bugs