Fixed indentstuff and support for limits and offsets