Integration to v1.0

Combined everything (expect logging). Works fine.