* removed some declaration + fixed mistyping