improvements for Awesome