fixes for warlock, and also small changes to urban home