Fixed several issues and added new configurations