finally got the symlinks up and running and cleaned this up a bit.