fixed some things but not much really..