fixing some stuff, adding extras at end.