Fixed #139
Optimized Damage Calc
More of #113
Merged movement