Added/fixed !subscribe and !listen a bit