Some updates

Some updates in map paint and validator