Update and sync of the three stupid immenCity forks into one.