bug fixes stage one