added axes, cleaned up code a bit