Improve the loader. More comments and other improvments