various fixes for UI and serialization