updated lotta stuff