Several new functions and bugfixes
Several new functions and bugfixes