improvements
normalization added
small fixes