one more floor and other corrections