refactorization; fixed #1 & minor bugs; new functions, texts & comments