added ssh tunnel + optimized header files