added all the small bits