Many improvements, including using proper models and simplifying code loading.