Fixed some auto-complete params for IDE
Fixed some return values not totally correct