fixed composition
added normalization of derivatives
last commit before moving repo