fixed numerous error