More bug fixes based on feedback from other people