fixin' all the bugs