some const are now added in proper spots