add some const keywords where applicable
remove unneeded include