Added comments and fixed address mask