Some bug fixes from ra's room