fixed stuff and shit