minor changes to loader and main