Functions parsing added; minor bugs fixed;