Minor changes

Fix an accidental reversion
UGH GODDAMMIT WARNINGS
updated changelog