temp
Enhancements and bugfixes