Minor improvements and bugfixes
Adding another dependency to composer [no ci]