#18 additional fixes and undefined notices; changed double qoutes to single