Fixed more x/y issues and let app take in args.