many minor changes + add floor