tryin to fix da bugs