Partial update

Editing some stuff. Will finish it soon. #gklst