Many bug fixes :)