tidying + better hex support