Worked on jasy-doc generator + fixes