Last minute fixes... some weird error still exist