More slow but steady fixes. Still haven't done any studying.