organism bugs fixed