QML fixes; cleanup