changes
fixing bugs..ugh