Fix some stuff and add draw class