Minor bugfixes + improved server example