Minor fixes, ready to re-engage programming streak