Cleaned up code a bunch. Mostly whitespace, with a few code changes. Needs more testing. Also allowing variables to be used as user commands