some minor changes :^)