fixes; issues solved: #103