Resolved #31, closed #32, closed #33, resolved #34, closed #35