Floor revamp: fixed runtimes and a couple mistakes