Small bugs
Revert "Overhaul"

This reverts commit 58e7765ad0350e2fe8281cd625561eee14055ad8.