Fix bug in fill-above
Cleanup