Fixed some auto-complete & return points

Nothing revolutionary, but might help development with IDEs