Final changes on wacky

worked out bugs, transferred info properly.