More Small fixes but i'm having a weird error problem if someone can check that out?