Small update + Tobias fixes