easier self blocking problem fix
minor fix and comment