Improvements from real-world scenario and bugfixes