Some minor improvementes have been done