Correct auto-load, external control and everything (Cvetan and Matevz)