Idea project and minor fixes
merge
merge followup
Serialization