new branch, new code, yippee
corrected warnings
changes to main