Updated to 2.0 of the core library
minor fixes