Fixed bugs from last night. Sped up *-handling.