Beds now work properly fixes #707

Also fixes FS392