Just some bug fixes and smaller improvments.