Fixed Many things...