fixed bugs
fixed all da bugs