move menu around to make more sense and explain library usage, cleanup