Improvements, bugfixes