fixed link issue, Added some room functionality