Bugfixes and exp saving