Funserver Updates 03

More updates #3