Several bug fixes, simplification and release zipping