some boundary condition fixes and unique question!

no1 reads desc. :D