some bug fixes or twiddling idk really