V1.01 - boundary detection bug fixes