Tryin' to fix some bugs