Make a better boundary condition, and provide a partial fix for a problem parsing signs.