Bug fixes
merge
Edit actions