Misc. changes and probably some fuq ups