witched to goobook for aliases, misc optimisations