Tidied a bit and added some door stuff