* fixed membrane
* bugfixes
* git cleanup