crazy cleanup
updated examples
updated examples again
use $app
mixed up original and alias