Quite old uncommitted changes
Update permanent address
Remove unnecessary comments and trailing whitespace
Fall 2013