Added pills + tidied a few things up