Updated some declarations and stuff