Minor code touchups, significant features on their way...