Misc. changes and stuff