fixing derptastic mistakes and misorganization