delete markers, fixed few bugs