Code

more fixes and removal of certain sentences not needed