Minor changes, still trying to fix connecting issues