Improvements to loading

Signed-off-by: Aleksi Sapon <QcTechs@gmail.com>
Port to Bukkit: compiles and passes tests

Signed-off-by: Aleksi Sapon <QcTechs@gmail.com>
Bukkit Port: works!

Signed-off-by: Aleksi Sapon <QcTechs@gmail.com>