Added and Fixed Many Things