added source map and fixes