cleanup, multiple fixes, added knpmenu