Fix console to use $ as trigger, and adjust logic