Added comments and "tolerance"