Fix aliases
Add rudimentary targetting support, fix issue with whitespace breaking the history