Match ins and venter bed

Also fixes some bugs