Uppdate PropHandling

This os the uppdating of PropHandling with all comments that i made in
it.