Pulling general improvements from master branch