small changes with stuff explained in NOTES for stage1
some code style fixes and removed a non relevant message from NOTES