added *.swp to list
Minor fixes to remove warnings during compile