Added some small bits to the main