update, and remove bookmark+ for now due to conflicts with auto-complete