Meta-fix added + some minor changes