fixed nearly everythin