Homework Model and some fixes