Monster move and lot of minor fix