improved frame state functionality etc.