fix "=" bug, fix "sr" bug, better func names