progress + bug fixes