appstack fixes
new fixes with extra features