checkpoint
bugfixes.