Added some more cosmetics thanks to Sarah