fixed some stuff(will test in the morning)