Fixed initialization
Added: preparation to oauth connection
Various fixes