faster floor, comment changes, tests