Make commnts Pretty. Small fixes and Updates. Tests