changes map default type
fix issues
minor fix