More button fixes and networking =)