Added upgrade instructions, minor fixes, deprecations