Week4 cleanup

Closes a pair of pending issues