Fixed some small issues with the increment