Added discriptions, moved some rooms