third commit

fixed room params, skip rooms with zero count, misc bug fixes