fixed numerous things