Add .swp to gitignore (vim)
Fix several errors and refine debug output