some improvements after running it a bit