Code cleanup
More code cleanup
Match current version
make setup functions static as appropriate to avoid errors
Apply patch from C. Daniel Chase for 4.0 compatibility.
Version 5.5.1