Add some alias support, could use a couple more things, but mainly it seems to work.
couple more alias bugs.  I expect there's a few more.  I should include tests.
move some things around and manifest