Fill detection final, final improvements