changed swap/bak location
added more stuff