// refactorization kills bugs
// small fixes