Fixed Normalization, added final fixes, finished comments