bug fixes, now running