Cleanup and changes and adds support for #27