added some TODOs, improved punyamas commandline, pull and reload.