Working markers, various improvements and fixes