bugfixing, adjustments, new functions, improve parser