uncommented stuff, added source references