some updates, worked on formatting