Updated config options, deleted unnecessary files, fixed some header stuff