Fixing erros and Release