update for raring, many fixes