Updated compilation, added notes