Minor fixes
All working now w/o gui