fixed stuff & added stuff