MAJOR updates!, still doesn't delete redundant fils; everything else is perfect