add grid for axis & some bugfixes