fixed room pub/sub and decided seperate collection was better
removed unecessary room calcs