Seveal bugs sorted out
Seveal bugs sorted out