GREAT, command line works! Also fixed some tiny issue.