Bugs, renaming, fixes and tricks.