added proper movement, finished battle scene assembling