updated for 0.18.0-rc5
fixed up some of the compiler warnings
fixed up final compiler warning