Periodic Pull Request

Contains many issue fixes and new features.