Some bugs fixed + bibliography