changes for APrompter changes
small bug fixes for organize