Bunch of different changes to improve ease of use and addition of
actions