bugfixes

expiration set correct and servo no more included