Sound improvements
style improvements