Adding new markers, search fixes, Javadoc