Some bug fixes from the live site