fixed some stuff - sketchy