Improved load times, moved things around.

Signed-off-by: interdpth <interdpth@gmail.com>
Merge branch 'master' into interdpth-master