updated & fixed, add notes