More functions and fixes on daniel_plugin