Code

gitk: More bug fixes and cleanups