need bug fixes