Added markers
close fix for WSP_MMAP and minor fixes