removed npe
work on adjusting axes properly