Added connection message + fixes