changed to using [swap] +  [expr] for a lot of stuff

yerp that and a lot of little fixes, changes to help files and the such