fixed alot of stupid bugs