added DispatchMethod annotation
cleaned some stuff up