Added comments, better loading