NEW: Sources (and other bugfixes too! :))