Fixed some more errors, think i made more flexible...