wy0pull needed corrections, misc niceness/spacing