almost done!
fixed some stuff