most recent changes, fixing warnings and errors