Updated Timer and some network code