some bootstrap fixing, credits