added markers, fixed bugs