Added views + various other small changes (JHS)