Bugfixes and Demographics added