fix bugs, just need to add the auto fill bed, and send to danny