Adding attract mode.
minor cleanup