Add axis and some bugfix