Name => id migration for room.
cleanup
Various small bug fixes