update to 4.4W, fixes to comments and indentation