added avianrr's module updates and other fixes to my codebase....
lots of changes....not documented yet.