fixed paths, made broadcast slightly nicer