+ Fix transaction issues
+ Change some text
Draft: Rewrite of defaults handling