Updated fill_pattern and fixed some other odds and ends