some fixes for wrong variable names, also cleaned it up for aibo