fixed some local mis-identification bugs