Several changes on habitat stuff.