Updated tons of good stuff :)