Minor tweaks

Updated floor and ceil for upcoming rewrite