cleaned up some american stuff and fixed an issue with i defer thing