fixing some bugs
capital moves
merged