Add manual and fix variables