closed #5. Closed #4. Added more orange and fixed some formatting