lotsa changes and inclusion of elpy