Added a few fixes and resets (normalize)