Updated minor stuff and constants