various small improvements and changes made, nothing big