trying to do some fixes for poor typing