Fixes and improvements
Make write the proposal