more changes + initial movable block stuff