fix for star propagattion; some bug fixes