update with bug fixes from app framework