some fixes to merge, removed app-bak