Added sourcemaps. Fixed bug when marked did not set up