removed nonexistent parameters
pulled camera branch changes