fixed x/y axis confusion, many bugs