Some improvements

This should help out.