overhaul

fixed user issues