Taikero Fix

Using bug fixes and several variable/method renames for clarity.

Some suggested changes were not merged due to PEP8 concerns.