various changes and additions

i commented my changes