Fixes for #111 and #112

the fix for #111 is still missing the name collision in the zip file. will add this later
the fix for #112 is working on new installations only. Technically this needs a db update script/function