Some minor things implemented