fixed derp
fixed bugs