bug fixes working now