Massive updates to apptools