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