Fixed Project and added command line args for custom loading