improvments and additions
removes deprecated file