Some finishing touches and rework on psederp and index