remove bugs
add gson functionality to view map