Fixed some auto-complete & return points

Nothing revolutionary, but might help development with IDEs 
@Pierstoval It should be sufficient to add `return 0` after line 93 instead.