fixing and fixing but making new bugs alot :D