Fixing some things i guess, Maybe?