test stuff & bug fixes