Tables filled + bug fix