Added a few little bits